Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 9 Jan 2012 17:26:37 +0000 (09:26 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 9 Jan 2012 17:26:37 +0000 (09:26 -0800)
commit01eeea4386a88419e4606457e837f5ec4becc795
tree88b829e27f94c97bbb891a573223bede6b33495c
parent9975dc7a31b85a93772697ae4e6cc19288a976ed
parentbf2a475c5e7d9d38686bd1c71da1514542f6d43e
Merge from trunk.